Use G_BEGIN_DECLS/G_END_DECLS. Bug #505268.

svn path=/trunk/; revision=19238

diff --git a/ChangeLog b/ChangeLog
index 3fb8c05da51e6772af9edc9f7a523a3fa0d05f05..00db3500c61e87158f5e7f07a89c0408a2c9d465 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-22  Christian Persch  <chpe@gnome.org>
+
+        * modules/other/gail/*.h: Use G_BEGIN_DECLS/G_END_DECLS. Bug #505268.
+       
 2007-12-22  Christian Persch  <chpe@gnome.org>
 
        * modules/other/gail/*.[ch]: Remove relocations from the atk

diff --git a/modules/other/gail/gail-private-macros.h b/modules/other/gail/gail-private-macros.h
index bb2022ba78d9e795fc4fda2ed4d45f5e581ee810..6e33ff7198105e73a9598ac0ef9536017bd528a6 100644 (file)
--- a/modules/other/gail/gail-private-macros.h
+++ b/modules/other/gail/gail-private-macros.h
@@ -21,18 +21,13 @@
 #ifndef __GAIL_PRIVATE_MACROS_H__
 #define __GAIL_PRIVATE_MACROS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Note: these macros are logic macros, not intended to warn on failure. */
 
 #define gail_return_val_if_fail(a, b)  if (!(a)) return (b)
 #define gail_return_if_fail(a) if (!(a)) return
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_PRIVATE_MACROS_H__ */

diff --git a/modules/other/gail/gailadjustment.h b/modules/other/gail/gailadjustment.h
index 4a6b38b8736065926800cccd843d319e440d2a4d..790534dc9ff9d251660045f2f5f15ba695ad29e6 100644 (file)
--- a/modules/other/gail/gailadjustment.h
+++ b/modules/other/gail/gailadjustment.h
@@ -22,10 +22,7 @@
 
 #include <atk/atk.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_ADJUSTMENT                     (gail_adjustment_get_type ())
 #define GAIL_ADJUSTMENT(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ADJUSTMENT, GailAdjustment))
@@ -53,9 +50,6 @@ struct _GailAdjustmentClass
 
 AtkObject *gail_adjustment_new (GtkAdjustment *adjustment);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_ADJUSTMENT_H__ */

diff --git a/modules/other/gail/gailarrow.h b/modules/other/gail/gailarrow.h
index 7d58d78cf630b07f621b5396dc710a0a5fce1c22..91f8894bf13f22369b42c236bb5af8d4e7674c71 100644 (file)
--- a/modules/other/gail/gailarrow.h
+++ b/modules/other/gail/gailarrow.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_ARROW                      (gail_arrow_get_type ())
 #define GAIL_ARROW(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ARROW, GailArrow))
@@ -51,9 +49,6 @@ struct _GailArrowClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_ARROW_H__ */

diff --git a/modules/other/gail/gailbooleancell.h b/modules/other/gail/gailbooleancell.h
index cc5dc2d6d70d2e4805aa40523b1210089cde4c49..ac803cfeba813eaf51d14891ab7b25d8d5447c37 100644 (file)
--- a/modules/other/gail/gailbooleancell.h
+++ b/modules/other/gail/gailbooleancell.h
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gail/gailrenderercell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_BOOLEAN_CELL            (gail_boolean_cell_get_type ())
 #define GAIL_BOOLEAN_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BOOLEAN_CELL, GailBooleanCell))
@@ -52,9 +50,6 @@ struct _GailBooleanCellClass
 
 AtkObject *gail_boolean_cell_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_BOOLEAN_CELL_H__ */

diff --git a/modules/other/gail/gailbox.h b/modules/other/gail/gailbox.h
index 64a90dd65e2dc4ac9c8f7d37c373b9255dee7de2..dd92ea7bcc19a026961c464dbef60599adff53c0 100644 (file)
--- a/modules/other/gail/gailbox.h
+++ b/modules/other/gail/gailbox.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_BOX                        (gail_box_get_type ())
 #define GAIL_BOX(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BOX, GailBox))
@@ -49,9 +47,6 @@ struct _GailBoxClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_BOX_H__ */

diff --git a/modules/other/gail/gailbutton.h b/modules/other/gail/gailbutton.h
index 7f3c30a76a5534af3d0bc5696cfe7ce425587875..3ce770d47a7665b3913e790a7215044bd7f1b5af 100644 (file)
--- a/modules/other/gail/gailbutton.h
+++ b/modules/other/gail/gailbutton.h
@@ -24,10 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_BUTTON                     (gail_button_get_type ())
 #define GAIL_BUTTON(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BUTTON, GailButton))
@@ -67,9 +64,6 @@ struct _GailButtonClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_BUTTON_H__ */

diff --git a/modules/other/gail/gailcalendar.h b/modules/other/gail/gailcalendar.h
index ef6290b7c8d85266214fef457df25cb0d7505a31..352098c6c064ccd29d8b88356e725ec36c2b04f3 100644 (file)
--- a/modules/other/gail/gailcalendar.h
+++ b/modules/other/gail/gailcalendar.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CALENDAR                   (gail_calendar_get_type ())
 #define GAIL_CALENDAR(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CALENDAR, GailCalendar))
@@ -49,9 +47,6 @@ struct _GailCalendarClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CALENDAR_H__ */

diff --git a/modules/other/gail/gailcell.h b/modules/other/gail/gailcell.h
index 9e3bae55d91e7b7642e4abf4babb26bef926e725..1ab0f41241b130870c84fc6fbea7ea4026e093bf 100644 (file)
--- a/modules/other/gail/gailcell.h
+++ b/modules/other/gail/gailcell.h
@@ -22,10 +22,7 @@
 
 #include <atk/atk.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CELL                           (gail_cell_get_type ())
 #define GAIL_CELL(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CELL, GailCell))
@@ -70,7 +67,6 @@ struct _ActionInfo {
   ACTION_FUNC do_action_func;
 };
 
-
 void      gail_cell_initialise           (GailCell        *cell,
                                           GtkWidget       *widget, 
                                           AtkObject       *parent,
@@ -99,12 +95,6 @@ gboolean gail_cell_remove_action         (GailCell        *cell,
 gboolean gail_cell_remove_action_by_name (GailCell        *cell,
                                           const gchar     *action_name);
 
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CELL_H__ */

diff --git a/modules/other/gail/gailcellparent.h b/modules/other/gail/gailcellparent.h
index 3932093ccb6c179da6a957c272730b8aa36d96ed..1e2a43b403921ac6448e1f73351ddcba69dcddac 100644 (file)
--- a/modules/other/gail/gailcellparent.h
+++ b/modules/other/gail/gailcellparent.h
@@ -25,9 +25,7 @@
 #include <atk/atkutil.h>
 #include <gail/gailcell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The GailCellParent interface should be supported by any object which
@@ -82,7 +80,6 @@ void  gail_cell_parent_get_cell_area           (GailCellParent        *parent,
 gboolean gail_cell_parent_grab_focus           (GailCellParent        *parent,
                                                 GailCell              *cell);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
 #endif /* __GAIL_CELL_PARENT_H__ */

diff --git a/modules/other/gail/gailcheckmenuitem.h b/modules/other/gail/gailcheckmenuitem.h
index 292cdd9aae3c7c6e405001917443c7664eec6a21..5821ce77c291f52c84cb21e968f67fabdba97d81 100644 (file)
--- a/modules/other/gail/gailcheckmenuitem.h
+++ b/modules/other/gail/gailcheckmenuitem.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CHECK_MENU_ITEM              (gail_check_menu_item_get_type ())
 #define GAIL_CHECK_MENU_ITEM(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CHECK_MENU_ITEM, GailCheckMenuItem))
@@ -51,9 +49,6 @@ struct _GailCheckMenuItemClass
 
 AtkObject* gail_check_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CHECK_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailchecksubmenuitem.h b/modules/other/gail/gailchecksubmenuitem.h
index 174cdbafe342f804b8d44ea7069c4015a1358fd8..f46e66ff1017d03c377a98c94b0c4fb704408a5f 100644 (file)
--- a/modules/other/gail/gailchecksubmenuitem.h
+++ b/modules/other/gail/gailchecksubmenuitem.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailsubmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CHECK_SUB_MENU_ITEM              (gail_check_sub_menu_item_get_type ())
 #define GAIL_CHECK_SUB_MENU_ITEM(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CHECK_SUB_MENU_ITEM, GailCheckSubMenuItem))
@@ -51,9 +49,6 @@ struct _GailCheckSubMenuItemClass
 
 AtkObject* gail_check_sub_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CHECK_SUB_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailclist.h b/modules/other/gail/gailclist.h
index d7b65a3e1b56c949ebd1a2ee14e61b78a2ac44a6..f51104ea220a2fcb00a389d90a781cea7878cf18 100644 (file)
--- a/modules/other/gail/gailclist.h
+++ b/modules/other/gail/gailclist.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CLIST                      (gail_clist_get_type ())
 #define GAIL_CLIST(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CLIST, GailCList))
@@ -62,9 +60,6 @@ struct _GailCListClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CLIST_H__ */

diff --git a/modules/other/gail/gailclistcell.h b/modules/other/gail/gailclistcell.h
index 0cd208ce29919647675c7694fc3e32092390735f..fca0620706751eba667dea0f69ccb8152d3a1f1a 100644 (file)
--- a/modules/other/gail/gailclistcell.h
+++ b/modules/other/gail/gailclistcell.h
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gail/gailcell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CLIST_CELL                     (gail_clist_cell_get_type ())
 #define GAIL_CLIST_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CLIST_CELL, GailCListCell))
@@ -51,9 +49,6 @@ struct _GailCListCellClass
 
 AtkObject *gail_clist_cell_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CLIST_CELL_H__ */

diff --git a/modules/other/gail/gailcombo.h b/modules/other/gail/gailcombo.h
index 6d99e7363865762b69ef59ae7cd1253062bc2065..3acc74b07b1da76be0e746f2e067e08a34571fc0 100644 (file)
--- a/modules/other/gail/gailcombo.h
+++ b/modules/other/gail/gailcombo.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_COMBO                      (gail_combo_get_type ())
 #define GAIL_COMBO(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_COMBO, GailCombo))
@@ -57,9 +54,6 @@ struct _GailComboClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_COMBO_H__ */

diff --git a/modules/other/gail/gailcombobox.h b/modules/other/gail/gailcombobox.h
index 8de7d5589d2ea2e029527c2cb601cd5765da548a..b3427159007b01f2cedab255c514de642b34f6b5 100644 (file)
--- a/modules/other/gail/gailcombobox.h
+++ b/modules/other/gail/gailcombobox.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_COMBO_BOX                      (gail_combo_box_get_type ())
 #define GAIL_COMBO_BOX(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_COMBO_BOX, GailComboBox))
@@ -58,9 +55,6 @@ struct _GailComboBoxClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_COMBO_BOX_H__ */

diff --git a/modules/other/gail/gailcontainer.h b/modules/other/gail/gailcontainer.h
index fab2e5573bdb635b3f65db9a03b898960840acb4..3ad738193dbee3bc5280337e19e76016e682a7ee 100644 (file)
--- a/modules/other/gail/gailcontainer.h
+++ b/modules/other/gail/gailcontainer.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CONTAINER                  (gail_container_get_type ())
 #define GAIL_CONTAINER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CONTAINER, GailContainer))
@@ -62,9 +59,6 @@ struct _GailContainerClass
                       gpointer     data);
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_CONTAINER_H__ */

diff --git a/modules/other/gail/gailcontainercell.h b/modules/other/gail/gailcontainercell.h
index 022b78bb637f0bbffc20c97b4528b4e7460e0d6a..739a334504c9cd3f6171d39b9e3f52bfe25f484c 100644 (file)
--- a/modules/other/gail/gailcontainercell.h
+++ b/modules/other/gail/gailcontainercell.h
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gail/gailcell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_CONTAINER_CELL            (gail_container_cell_get_type ())
 #define GAIL_CONTAINER_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CONTAINER_CELL, GailContainerCell))
@@ -62,10 +60,6 @@ void
 gail_container_cell_remove_child (GailContainerCell *container,
                                  GailCell *child);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */

diff --git a/modules/other/gail/gailentry.h b/modules/other/gail/gailentry.h
index aeed8456fde38d8beb7507840a28524b540be961..150025e50bf1e4b03d436538bff44cacfdc1fc17 100644 (file)
--- a/modules/other/gail/gailentry.h
+++ b/modules/other/gail/gailentry.h
@@ -24,9 +24,7 @@
 #include <gail/gailwidget.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_ENTRY                      (gail_entry_get_type ())
 #define GAIL_ENTRY(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ENTRY, GailEntry))
@@ -68,9 +66,6 @@ struct _GailEntryClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_ENTRY_H__ */

diff --git a/modules/other/gail/gailexpander.h b/modules/other/gail/gailexpander.h
index 94644c551e9922ea43a7036ef8d6937a6dd142dd..721a115a21b754c54da9751e851c78eced498b46 100644 (file)
--- a/modules/other/gail/gailexpander.h
+++ b/modules/other/gail/gailexpander.h
@@ -24,9 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_EXPANDER              (gail_expander_get_type ())
 #define GAIL_EXPANDER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_EXPANDER, GailExpander))
@@ -56,9 +54,6 @@ struct _GailExpanderClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_EXPANDER_H__ */

diff --git a/modules/other/gail/gailframe.h b/modules/other/gail/gailframe.h
index 4977ea04ba1f669ea15e3f6614b855b6e379eb70..49f2b55d0f76e867a2bc292654bd0eb0848a96f5 100644 (file)
--- a/modules/other/gail/gailframe.h
+++ b/modules/other/gail/gailframe.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_FRAME                      (gail_frame_get_type ())
 #define GAIL_FRAME(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_FRAME, GailFrame))
@@ -50,9 +47,6 @@ struct _GailFrameClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_FRAME_H__ */

diff --git a/modules/other/gail/gailhtmlbox.h b/modules/other/gail/gailhtmlbox.h
index c03215be784960e262ce875b24152ccaaa2ba53b..eef67f4026af650ae2a7d7269aeb768ecd6ddb6b 100644 (file)
--- a/modules/other/gail/gailhtmlbox.h
+++ b/modules/other/gail/gailhtmlbox.h
@@ -22,9 +22,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_HTML_BOX                   (gail_html_box_get_type ())
 #define GAIL_HTML_BOX(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_HTML_BOX, GailHtmlBox))
@@ -48,9 +46,6 @@ struct _GailHtmlBoxClass
 
 GType gail_html_box_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_HTML_BOX_H__ */

diff --git a/modules/other/gail/gailimage.h b/modules/other/gail/gailimage.h
index 6221fc0416b116c382ea3f5dffddd924f46e4a43..9feadd44f741f67f5ea2136cce06dcacaf5f50c6 100644 (file)
--- a/modules/other/gail/gailimage.h
+++ b/modules/other/gail/gailimage.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_IMAGE                      (gail_image_get_type ())
 #define GAIL_IMAGE(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_IMAGE, GailImage))
@@ -52,9 +50,6 @@ struct _GailImageClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_IMAGE_H__ */

diff --git a/modules/other/gail/gailimagecell.h b/modules/other/gail/gailimagecell.h
index 7dfd65c54744dc30bebcaa5cc6da3a8f6eacf1c0..d6f3ebc2cdf24633c963c0fbed3b98378c0b1afb 100644 (file)
--- a/modules/other/gail/gailimagecell.h
+++ b/modules/other/gail/gailimagecell.h
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gail/gailrenderercell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_IMAGE_CELL            (gail_image_cell_get_type ())
 #define GAIL_IMAGE_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_IMAGE_CELL, GailImageCell))
@@ -54,9 +52,6 @@ struct _GailImageCellClass
 
 AtkObject *gail_image_cell_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_IMAGE_CELL_H__ */

diff --git a/modules/other/gail/gailitem.h b/modules/other/gail/gailitem.h
index 447ea38cbddc7aaba0e962f68ac7a98cc443f8ca..08b0eb647e5578592b3761b090734662c598657f 100644 (file)
--- a/modules/other/gail/gailitem.h
+++ b/modules/other/gail/gailitem.h
@@ -24,9 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_ITEM                          (gail_item_get_type ())
 #define GAIL_ITEM(obj)                          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ITEM, GailItem))
@@ -54,9 +52,6 @@ struct _GailItemClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_ITEM_H__ */

diff --git a/modules/other/gail/gaillabel.h b/modules/other/gail/gaillabel.h
index c3acf06ffae4cd32dbcc896a7d006baa87e55ab9..24e2af7f7f86e994176384de8931855aaa382a18 100644 (file)
--- a/modules/other/gail/gaillabel.h
+++ b/modules/other/gail/gaillabel.h
@@ -24,9 +24,7 @@
 #include <gail/gailwidget.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_LABEL                      (gail_label_get_type ())
 #define GAIL_LABEL(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_LABEL, GailLabel))
@@ -57,9 +55,6 @@ struct _GailLabelClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_LABEL_H__ */

diff --git a/modules/other/gail/gaillist.h b/modules/other/gail/gaillist.h
index e937a10fa5ec09d28c5a8af1531dbeecadf21d45..d2e2ce5bdb442549cbe8bd27ac07ddd1ef85825f 100644 (file)
--- a/modules/other/gail/gaillist.h
+++ b/modules/other/gail/gaillist.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_LIST                       (gail_list_get_type ())
 #define GAIL_LIST(obj)                       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_LIST, GailList))
@@ -49,9 +47,6 @@ struct _GailListClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_LIST_H__ */

diff --git a/modules/other/gail/gailmenu.h b/modules/other/gail/gailmenu.h
index 3ce04157f9e6f8d6795db4ab4dcc20a92f2db79a..f25aae542208af4b8cb834c49bc0e9cca05669ce 100644 (file)
--- a/modules/other/gail/gailmenu.h
+++ b/modules/other/gail/gailmenu.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailmenushell.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_MENU                          (gail_menu_get_type ())
 #define GAIL_MENU(obj)                          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_SHELL, GailMenu))
@@ -50,9 +47,6 @@ struct _GailMenuClass
   GailMenuShellClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_MENU_H__ */

diff --git a/modules/other/gail/gailmenuitem.h b/modules/other/gail/gailmenuitem.h
index a7e0f647267c3745acdb0b728e6642d8f284bc99..fd011bebacd2ea28a5b6cba3d7241756eeccced1 100644 (file)
--- a/modules/other/gail/gailmenuitem.h
+++ b/modules/other/gail/gailmenuitem.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailitem.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_MENU_ITEM                     (gail_menu_item_get_type ())
 #define GAIL_MENU_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_ITEM, GailMenuItem))
@@ -56,9 +53,6 @@ struct _GailMenuItemClass
 
 AtkObject* gail_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailmenushell.h b/modules/other/gail/gailmenushell.h
index 0c099a051fc23e0d3b6f35c2e69057a53ac1bb35..17b32c6c0e37f8b5ac975a8c890e5b31c3668d22 100644 (file)
--- a/modules/other/gail/gailmenushell.h
+++ b/modules/other/gail/gailmenushell.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_MENU_SHELL                    (gail_menu_shell_get_type ())
 #define GAIL_MENU_SHELL(obj)                    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_SHELL, GailMenuShell))
@@ -50,9 +47,6 @@ struct _GailMenuShellClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_MENU_SHELL_H__ */

diff --git a/modules/other/gail/gailnotebook.h b/modules/other/gail/gailnotebook.h
index f2226b5cf74d2422e7f711cf128b366014b4fe9f..db6ebe276c4c292f3dde36d95942d1600280d687 100644 (file)
--- a/modules/other/gail/gailnotebook.h
+++ b/modules/other/gail/gailnotebook.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_NOTEBOOK                   (gail_notebook_get_type ())
 #define GAIL_NOTEBOOK(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_NOTEBOOK, GailNotebook))
@@ -63,9 +61,6 @@ struct _GailNotebookClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_NOTEBOOK_H__ */

diff --git a/modules/other/gail/gailnotebookpage.h b/modules/other/gail/gailnotebookpage.h
index 022f4affc753f5272ec2f239ade55e1eb6099084..9210c65e05f2a73d79600c5fffe906e29890c61b 100644 (file)
--- a/modules/other/gail/gailnotebookpage.h
+++ b/modules/other/gail/gailnotebookpage.h
@@ -25,9 +25,7 @@
 #include <gail/gailnotebook.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_NOTEBOOK_PAGE            (gail_notebook_page_get_type ())
 #define GAIL_NOTEBOOK_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),GAIL_TYPE_NOTEBOOK_PAGE, GailNotebookPage))
@@ -61,10 +59,6 @@ struct _GailNotebookPageClass
 
 AtkObject *gail_notebook_page_new(GtkNotebook *notebook, gint pagenum);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_NOTEBOOK_PAGE_H__ */
-

diff --git a/modules/other/gail/gailobject.h b/modules/other/gail/gailobject.h
index fc981a9c080d7d0c9456e304f9aed52bac881337..4aff2eeed0a864735eab604ba18c6e0a79a9b8ee 100644 (file)
--- a/modules/other/gail/gailobject.h
+++ b/modules/other/gail/gailobject.h
@@ -22,9 +22,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_OBJECT                  (gail_object_get_type ())
 #define GAIL_OBJECT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_OBJECT, GailObject)
@@ -48,9 +46,6 @@ struct _GailObjectClass
   AtkGObjectAccessibleClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_OBJECT_H__ */

diff --git a/modules/other/gail/gailoptionmenu.h b/modules/other/gail/gailoptionmenu.h
index 0e7bd186e2de83bdd14399113140cdb4e62b28a8..608ec26af353fc15ccbd0a0e1f5c0cc9975e9426 100644 (file)
--- a/modules/other/gail/gailoptionmenu.h
+++ b/modules/other/gail/gailoptionmenu.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailbutton.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_OPTION_MENU                (gail_option_menu_get_type ())
 #define GAIL_OPTION_MENU(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_OPTION_MENU, GailOptionMenu))
@@ -50,9 +47,6 @@ struct _GailOptionMenuClass
   GailButtonClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_OPTION_MENU_H__ */

diff --git a/modules/other/gail/gailpaned.h b/modules/other/gail/gailpaned.h
index bcf90c725f61fb945214b611851e37a1380f0e44..250e890dcd99912954a77c3a7f08a5359f106857 100644 (file)
--- a/modules/other/gail/gailpaned.h
+++ b/modules/other/gail/gailpaned.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_PANED                      (gail_paned_get_type ())
 #define GAIL_PANED(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PANED, GailPaned))
@@ -49,9 +47,6 @@ struct _GailPanedClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_PANED_H__ */

diff --git a/modules/other/gail/gailpixmap.h b/modules/other/gail/gailpixmap.h
index e77d1081f93773fc820621792380e164ed02ad01..8a4df448dd2301843ab3307291f8276459d458e7 100644 (file)
--- a/modules/other/gail/gailpixmap.h
+++ b/modules/other/gail/gailpixmap.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_PIXMAP                      (gail_pixmap_get_type ())
 #define GAIL_PIXMAP(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PIXMAP, GailPixmap))
@@ -52,9 +50,6 @@ struct _GailPixmapClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_PIXMAP_H__ */

diff --git a/modules/other/gail/gailprogressbar.h b/modules/other/gail/gailprogressbar.h
index 2f0e0241396c2fdc9f8f7cf2a2733757525afc7e..27b578a1f2de2e59bf74cb77ecd83815293f7659 100644 (file)
--- a/modules/other/gail/gailprogressbar.h
+++ b/modules/other/gail/gailprogressbar.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_PROGRESS_BAR                      (gail_progress_bar_get_type ())
 #define GAIL_PROGRESS_BAR(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PROGRESS_BAR, GailProgressBar))
@@ -52,9 +49,6 @@ struct _GailProgressBarClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_PROGRESS_BAR_H__ */

diff --git a/modules/other/gail/gailradiobutton.h b/modules/other/gail/gailradiobutton.h
index 92089a96bf0ca4fc3b670ea380540358c166cdd5..938c2830b5e430cea8a3ddcf996436dc01774e77 100644 (file)
--- a/modules/other/gail/gailradiobutton.h
+++ b/modules/other/gail/gailradiobutton.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailtogglebutton.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_RADIO_BUTTON               (gail_radio_button_get_type ())
 #define GAIL_RADIO_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_BUTTON, GailRadioButton))
@@ -51,9 +49,6 @@ struct _GailRadioButtonClass
   GailToggleButtonClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_RADIO_BUTTON_H__ */

diff --git a/modules/other/gail/gailradiomenuitem.h b/modules/other/gail/gailradiomenuitem.h
index b8f6847bdb3432b96bf74411adf53c2765026dbc..332d81f82d07cc058d93b9771db64fcb0631d5bc 100644 (file)
--- a/modules/other/gail/gailradiomenuitem.h
+++ b/modules/other/gail/gailradiomenuitem.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcheckmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_RADIO_MENU_ITEM               (gail_radio_menu_item_get_type ())
 #define GAIL_RADIO_MENU_ITEM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_MENU_ITEM, GailRadioMenuItem))
@@ -53,9 +51,6 @@ struct _GailRadioMenuItemClass
 
 AtkObject* gail_radio_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_RADIO_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailradiosubmenuitem.h b/modules/other/gail/gailradiosubmenuitem.h
index 10e2e7eb705db3d1e77dfc0be24972c2752650da..5bcf168b40b857f32aa95eb2b5b54826421649de 100644 (file)
--- a/modules/other/gail/gailradiosubmenuitem.h
+++ b/modules/other/gail/gailradiosubmenuitem.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailchecksubmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_RADIO_SUB_MENU_ITEM               (gail_radio_sub_menu_item_get_type ())
 #define GAIL_RADIO_SUB_MENU_ITEM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_SUB_MENU_ITEM, GailRadioSubMenuItem))
@@ -53,9 +51,6 @@ struct _GailRadioSubMenuItemClass
 
 AtkObject* gail_radio_sub_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_RADIO_SUB_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailrange.h b/modules/other/gail/gailrange.h
index c394c3382b7560e4e3f82d8a36296a9179b500ba..5e6bc0de175c02ecef086babff579ab913152a10 100644 (file)
--- a/modules/other/gail/gailrange.h
+++ b/modules/other/gail/gailrange.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_RANGE                          (gail_range_get_type ())
 #define GAIL_RANGE(obj)                          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RANGE, GailRange))
@@ -56,9 +53,6 @@ struct _GailRangeClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_RANGE_H__ */

diff --git a/modules/other/gail/gailrenderercell.h b/modules/other/gail/gailrenderercell.h
index f380647f209e2c50ffb4d7cf2b852445ed86e3ad..61464186855d4a602fc0aaf8e53009c472664142 100644 (file)
--- a/modules/other/gail/gailrenderercell.h
+++ b/modules/other/gail/gailrenderercell.h
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gail/gailcell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_RENDERER_CELL            (gail_renderer_cell_get_type ())
 #define GAIL_RENDERER_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RENDERER_CELL, GailRendererCell))
@@ -57,9 +55,6 @@ gail_renderer_cell_update_cache (GailRendererCell *cell, gboolean emit_change_si
 
 AtkObject *gail_renderer_cell_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */

diff --git a/modules/other/gail/gailscale.h b/modules/other/gail/gailscale.h
index 9e0687a0a616fefe0ff6cda6e7602de5d4ed84c0..b670a42bfc59b143df55c2bac32fd23be1660e6e 100644 (file)
--- a/modules/other/gail/gailscale.h
+++ b/modules/other/gail/gailscale.h
@@ -24,9 +24,7 @@
 #include <gail/gailrange.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SCALE                         (gail_scale_get_type ())
 #define GAIL_SCALE(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCALE, GailScale))
@@ -52,9 +50,6 @@ struct _GailScaleClass
   GailRangeClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SCALE_H__ */

diff --git a/modules/other/gail/gailscrollbar.h b/modules/other/gail/gailscrollbar.h
index 624aedef1ca53632486f8ee6ff95e1eb35f48129..37830e62eb007f866d9c2f19d0b4c7a758803256 100644 (file)
--- a/modules/other/gail/gailscrollbar.h
+++ b/modules/other/gail/gailscrollbar.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailrange.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SCROLLBAR                     (gail_scrollbar_get_type ())
 #define GAIL_SCROLLBAR(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCROLLBAR, GailScrollbar))
@@ -50,9 +47,6 @@ struct _GailScrollbarClass
   GailRangeClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SCROLLBAR_H__ */

diff --git a/modules/other/gail/gailscrolledwindow.h b/modules/other/gail/gailscrolledwindow.h
index b8564780f3f2ee3f91c4b02c2c3bb0c1e009cc0c..5d8b7c078c0ee3ac924489680cd5bf44d47acc55 100644 (file)
--- a/modules/other/gail/gailscrolledwindow.h
+++ b/modules/other/gail/gailscrolledwindow.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SCROLLED_WINDOW            (gail_scrolled_window_get_type ())
 #define GAIL_SCROLLED_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCROLLED_WINDOW, GailScrolledWindow))
@@ -49,9 +47,6 @@ struct _GailScrolledWindowClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SCROLLED_WINDOW_H__ */

diff --git a/modules/other/gail/gailseparator.h b/modules/other/gail/gailseparator.h
index 94420edcd6a09ddffe4b73622cc5e5f1b6540262..46a7882546b00a1c21f6a46c40d121de6ec83c19 100644 (file)
--- a/modules/other/gail/gailseparator.h
+++ b/modules/other/gail/gailseparator.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SEPARATOR                  (gail_separator_get_type ())
 #define GAIL_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SEPARATOR, GailSeparator))
@@ -49,9 +47,6 @@ struct _GailSeparatorClass
   GailWidgetClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SEPARATOR_H__ */

diff --git a/modules/other/gail/gailspinbutton.h b/modules/other/gail/gailspinbutton.h
index 140ac94dcd0ea68f30567682cacc688070e4b6e5..3dac8d18e6dd83724a2d84f7f6bb16fb8fcad080 100644 (file)
--- a/modules/other/gail/gailspinbutton.h
+++ b/modules/other/gail/gailspinbutton.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailentry.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SPIN_BUTTON                      (gail_spin_button_get_type ())
 #define GAIL_SPIN_BUTTON(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SPIN_BUTTON, GailSpinButton))
@@ -51,9 +49,6 @@ struct _GailSpinButtonClass
   GailEntryClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SPIN_BUTTON_H__ */

diff --git a/modules/other/gail/gailstatusbar.h b/modules/other/gail/gailstatusbar.h
index 52efc25bf8530739a77004b9455ee679ad35107f..6078731369a5a1f6a0e516ebb650344c1f08780e 100644 (file)
--- a/modules/other/gail/gailstatusbar.h
+++ b/modules/other/gail/gailstatusbar.h
@@ -24,9 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_STATUSBAR                  (gail_statusbar_get_type ())
 #define GAIL_STATUSBAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_STATUSBAR, GailStatusbar))
@@ -52,9 +50,6 @@ struct _GailStatusbarClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_STATUSBAR_H__ */

diff --git a/modules/other/gail/gailsubmenuitem.h b/modules/other/gail/gailsubmenuitem.h
index 91334c587e1248ed9e1679a8242a0e7f0eb173ef..963839e79fd36bcc5447c2adef4ea226b782aae8 100644 (file)
--- a/modules/other/gail/gailsubmenuitem.h
+++ b/modules/other/gail/gailsubmenuitem.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_SUB_MENU_ITEM                     (gail_sub_menu_item_get_type ())
 #define GAIL_SUB_MENU_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SUB_MENU_ITEM, GailSubMenuItem))
@@ -52,9 +50,6 @@ struct _GailSubMenuItemClass
 
 AtkObject* gail_sub_menu_item_new (GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_SUB_MENU_ITEM_H__ */

diff --git a/modules/other/gail/gailtextcell.h b/modules/other/gail/gailtextcell.h
index 76c1ade872b1d57190f423bd68b67de71b9f2a57..c15888274834bfd6f293b1e8900c321b97fbe195 100644 (file)
--- a/modules/other/gail/gailtextcell.h
+++ b/modules/other/gail/gailtextcell.h
@@ -24,9 +24,7 @@
 #include <gail/gailrenderercell.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_TEXT_CELL            (gail_text_cell_get_type ())
 #define GAIL_TEXT_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_CELL, GailTextCell))
@@ -56,9 +54,6 @@ struct _GailTextCellClass
 
 AtkObject *gail_text_cell_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */

diff --git a/modules/other/gail/gailtextview.h b/modules/other/gail/gailtextview.h
index 4dfd48e9eac956fa2b7978d28b1ab375081f2af4..273694dff0a8f70d55cb720839e0313204af80b2 100644 (file)
--- a/modules/other/gail/gailtextview.h
+++ b/modules/other/gail/gailtextview.h
@@ -24,9 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_TEXT_VIEW                  (gail_text_view_get_type ())
 #define GAIL_TEXT_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_VIEW, GailTextView))
@@ -62,9 +60,6 @@ struct _GailTextViewClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TEXT_VIEW_H__ */

diff --git a/modules/other/gail/gailtogglebutton.h b/modules/other/gail/gailtogglebutton.h
index b390d8356dd0c2adfb2956309c3ef7c109138d8b..aa93210bd0b8ed9e9e5f61c50939591a130b9e70 100644 (file)
--- a/modules/other/gail/gailtogglebutton.h
+++ b/modules/other/gail/gailtogglebutton.h
@@ -23,9 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailbutton.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_TOGGLE_BUTTON              (gail_toggle_button_get_type ())
 #define GAIL_TOGGLE_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TOGGLE_BUTTON, GailToggleButton))
@@ -49,9 +47,6 @@ struct _GailToggleButtonClass
   GailButtonClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TOGGLE_BUTTON_H__ */

diff --git a/modules/other/gail/gailtoplevel.h b/modules/other/gail/gailtoplevel.h
index 82ee7f58a86394f58e31a1fad8829bf2e7f0b742..d5ca8d5198895aa280bdcb0133afde47e873ac28 100644 (file)
--- a/modules/other/gail/gailtoplevel.h
+++ b/modules/other/gail/gailtoplevel.h
@@ -22,9 +22,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_TOPLEVEL               (gail_toplevel_get_type ())
 #define GAIL_TOPLEVEL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TOPLEVEL, GailToplevel))
@@ -49,8 +47,6 @@ struct _GailToplevelClass
   AtkObjectClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GAIL_TOPLEVEL_H__ */

diff --git a/modules/other/gail/gailtreeview.h b/modules/other/gail/gailtreeview.h
index fd8a43fd1131e7437b04520cd540c5314beb224f..aeebfadaa87b5a2eb1b2c8f472ed7258c2a39f19 100644 (file)
--- a/modules/other/gail/gailtreeview.h
+++ b/modules/other/gail/gailtreeview.h
@@ -24,9 +24,7 @@
 #include <gail/gailcontainer.h>
 #include <gail/gailcell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_TREE_VIEW                  (gail_tree_view_get_type ())
 #define GAIL_TREE_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TREE_VIEW, GailTreeView))
@@ -68,9 +66,6 @@ struct _GailTreeViewClass
 
 AtkObject* gail_tree_view_ref_focus_cell (GtkTreeView *treeview);
  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_TREE_VIEW_H__ */

diff --git a/modules/other/gail/gailutil.h b/modules/other/gail/gailutil.h
index 4b968a62cae7f7d48efd05a18af61eee8baf4d4e..acc44d10b5acb96358fef9c17bc53e61e5f2c280 100644 (file)
--- a/modules/other/gail/gailutil.h
+++ b/modules/other/gail/gailutil.h
@@ -22,9 +22,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_UTIL                           (gail_util_get_type ())
 #define GAIL_UTIL(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_UTIL, GailUtil))
@@ -71,10 +69,6 @@ struct _GailMiscClass
   AtkMiscClass parent_class;
 };
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_UTIL_H__ */

diff --git a/modules/other/gail/gailwidget.h b/modules/other/gail/gailwidget.h
index 04fdae05092a4a37eecb35114523cd4ea125cfc8..bf046872f65d5c1882db52482023a1d314b05b0e 100644 (file)
--- a/modules/other/gail/gailwidget.h
+++ b/modules/other/gail/gailwidget.h
@@ -22,10 +22,7 @@
 
 #include <gtk/gtkaccessible.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_WIDGET                     (gail_widget_get_type ())
 #define GAIL_WIDGET(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_WIDGET, GailWidget))
@@ -63,9 +60,6 @@ struct _GailWidgetClass
 
 AtkObject*     gail_widget_new         (GtkWidget       *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_WIDGET_H__ */

diff --git a/modules/other/gail/gailwindow.h b/modules/other/gail/gailwindow.h
index 0b195072e697fc40a617203689d080b5f56ed227..923554add2906b0319d33858d6402a877b9b4030 100644 (file)
--- a/modules/other/gail/gailwindow.h
+++ b/modules/other/gail/gailwindow.h
@@ -23,10 +23,7 @@
 #include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAIL_TYPE_WINDOW                        (gail_window_get_type ())
 #define GAIL_WINDOW(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_WINDOW, GailWindow))
@@ -53,9 +50,6 @@ struct _GailWindowClass
   GailContainerClass parent_class;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GAIL_WINDOW_H__ */